master-bc-920

https://issues.liferay.com/browse/LIFERAYQA-6415