master-bc-1132

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