Merge changes introduced after code review