master-bc-915

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