master-bc-1653

https://issues.liferay.com/browse/LIFERAYQA-8875
https://issues.liferay.com/browse/LIFERAYQA-8765
https://issues.liferay.com/browse/LIFERAYQA-8793