master-bc-963

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