master-bc-1440

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