Merge "Point fixes after OSR change."