Merge comment fix from 3.5