master-bc-1632

https://issues.liferay.com/browse/LIFERAYQA-8566
https://issues.liferay.com/browse/LIFERAYQA-8764