master-bc-853

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