Pull request: C1_Osam_506_problem_wizard_1.28 #506