master-bc-991

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