master-bc-1484

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