master-bc-1658

https://issues.liferay.com/browse/LIFERAYQA-8894
https://issues.liferay.com/browse/LIFERAYQA-8821
https://issues.liferay.com/browse/LIFERAYQA-8906
https://issues.liferay.com/browse/LIFERAYQA-8918