master-bc-1049

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