master-bc-962

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