master-bc-1012

https://issues.liferay.com/browse/LIFERAYQA-7338
https://issues.liferay.com/browse/LIFERAYQA-7318
https://issues.liferay.com/browse/LIFERAYQA-7341
https://issues.liferay.com/browse/LIFERAYQA-7340
https://issues.liferay.com/browse/LIFERAYQA-7339