master-bc-997

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