master-bc-974

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