master-bc-854

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