master-bc-1252

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