[us36085] merge of not rebased changes from 34608