[Maria-developers] Updated (by Igor): ICP/MRR backport (67)