Cherry picked merge: bsltakin/master