master-bc-793

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