master-bc-1904

https://issues.liferay.com/browse/LIFERAYQA-9627
https://issues.liferay.com/browse/LIFERAYQA-9591
https://issues.liferay.com/browse/LIFERAYQA-9636
https://issues.liferay.com/browse/LIFERAYQA-9679
https://issues.liferay.com/browse/LIFERAYQA-9553