master-bc-2005

https://issues.liferay.com/browse/LIFERAYQA-9901
https://issues.liferay.com/browse/LIFERAYQA-9961
https://issues.liferay.com/browse/LIFERAYQA-9964
https://issues.liferay.com/browse/LIFERAYQA-9861
https://issues.liferay.com/browse/LIFERAYQA-9911
https://issues.liferay.com/browse/LIFERAYQA-9955
https://issues.liferay.com/browse/LIFERAYQA-9987