master-bc-798

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