master-bc-1628

https://issues.liferay.com/browse/LIFERAYQA-8387
https://issues.liferay.com/browse/LIFERAYQA-8719