Merge commit '756077d9877cc57245f968b6c1f29e755cca36e9' into framework