master-bc-1509

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