master-bc-1063

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