Merge commit '6d086b4da88bbf447b5d173d1dc4a8f83457d100' into framework