master-bc-1833

https://issues.liferay.com/browse/LIFERAYQA-9451
https://issues.liferay.com/browse/LIFERAYQA-9474
https://issues.liferay.com/browse/LIFERAYQA-9473