master-bc-825

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