master-bc-1533

https://issues.liferay.com/browse/LIFERAYQA-8456
https://issues.liferay.com/browse/LIFERAYQA-8346
https://issues.liferay.com/browse/LIFERAYQA-8518
https://issues.liferay.com/browse/LIFERAYQA-8509
https://issues.liferay.com/browse/LIFERAYQA-8533