master-bc-996

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