MDL-53638 mod_feedback: corrections during rebase: