master-bc-881

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