Merged from 5.1
Contentless merge from 5.2