master-bc-2188

https://issues.liferay.com/browse/LIFERAYQA-10055
https://issues.liferay.com/browse/LIFERAYQA-10440
https://issues.liferay.com/browse/LIFERAYQA-10454