master-bc-1364

https://issues.liferay.com/browse/LIFERAYQA-8121
https://issues.liferay.com/browse/LIFERAYQA-8150
https://issues.liferay.com/browse/LIFERAYQA-8153
https://issues.liferay.com/browse/LIFERAYQA-8159