master-bc-839

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