master-bc-1288

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