master-bc-817

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