master-bc-1147

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