master-bc-1903

https://issues.liferay.com/browse/LIFERAYQA-9566
https://issues.liferay.com/browse/LIFERAYQA-9711
https://issues.liferay.com/browse/LIFERAYQA-9747
https://issues.liferay.com/browse/LIFERAYQA-9748