master-bc-977

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