Merge "Remove unused static variable." into main