master-bc-1024

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