master-bc-3129

https://issues.liferay.com/browse/LIFERAYQA-12441
https://issues.liferay.com/browse/LIFERAYQA-12469
https://issues.liferay.com/browse/LIFERAYQA-12453
https://issues.liferay.com/browse/LIFERAYQA-12501