master-bc-1273

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