master-bc-1999

https://issues.liferay.com/browse/LIFERAYQA-9760
https://issues.liferay.com/browse/LIFERAYQA-9750
https://issues.liferay.com/browse/LIFERAYQA-9672
https://issues.liferay.com/browse/LIFERAYQA-9916