master-bc-804

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