master-bc-1043

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