master-bc-2805

https://issues.liferay.com/browse/LIFERAYQA-11705
https://issues.liferay.com/browse/LIFERAYQA-11712
https://issues.liferay.com/browse/LIFERAYQA-11723