master-bc-1924

https://issues.liferay.com/browse/LIFERAYQA-9774
https://issues.liferay.com/browse/LIFERAYQA-9779
https://issues.liferay.com/browse/LIFERAYQA-9728
https://issues.liferay.com/browse/LIFERAYQA-9701