master-bc-995

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