master-bc-1019

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