master-bc-1741

https://issues.liferay.com/browse/LIFERAYQA-8605
https://issues.liferay.com/browse/LIFERAYQA-9217