master-bc-924

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