master-bc-899

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