Merge "Fixing O1 compilation"