master-bc-1728

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