master-bc-1881

https://issues.liferay.com/browse/LIFERAYQA-9639
https://issues.liferay.com/browse/LIFERAYQA-9641
https://issues.liferay.com/browse/LIFERAYQA-9599