master-bc-2351

https://issues.liferay.com/browse/LIFERAYQA-10883
https://issues.liferay.com/browse/LIFERAYQA-10886
https://issues.liferay.com/browse/LIFERAYQA-10924