master-bc-2193

https://issues.liferay.com/browse/LIFERAYQA-10317
https://issues.liferay.com/browse/LIFERAYQA-10421
https://issues.liferay.com/browse/LIFERAYQA-10455
https://issues.liferay.com/browse/LIFERAYQA-10458