master-bc-994

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