master-bc-1987

https://issues.liferay.com/browse/LIFERAYQA-9862
https://issues.liferay.com/browse/LIFERAYQA-9837
https://issues.liferay.com/browse/LIFERAYQA-9852
https://issues.liferay.com/browse/LIFERAYQA-9865