master-bc-891

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