master-bc-1848

https://issues.liferay.com/browse/LIFERAYQA-9233
https://issues.liferay.com/browse/LIFERAYQA-9514
https://issues.liferay.com/browse/LIFERAYQA-9519