Merge master commit 'ac528e6a2300b092ad285339bf0c002b030c3be2' into framework