master-bc-1951

https://issues.liferay.com/browse/LIFERAYQA-9821
https://issues.liferay.com/browse/LIFERAYQA-9819
https://issues.liferay.com/browse/LIFERAYQA-9832