master-bc-1519

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