master-bc-1876

https://issues.liferay.com/browse/LIFERAYQA-9609
https://issues.liferay.com/browse/LIFERAYQA-9547
https://issues.liferay.com/browse/LIFERAYQA-9502