master-bc-916

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