master-bc-1793

https://issues.liferay.com/browse/LIFERAYQA-9405
https://issues.liferay.com/browse/LIFERAYQA-9237
https://issues.liferay.com/browse/LIFERAYQA-9389