master-bc-1516

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