master-bc-884

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