master-bc-1504

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