* commit '2931d8ace9118bafe08090cd41e235048b6c2eb2': DO NOT MERGE - Cherry picking from master to MR1