Merge branch 'MasterBugFixing' into 'master'
BS-11342, add a warning if the update of index fails
fix tests of some old migration steps
Merge branch 'master' into 'MasterBugFixing'