[Maria-developers] Please review patch for 12017 and 12018.