master-bc-1510

https://issues.liferay.com/browse/LIFERAYQA-8507
https://issues.liferay.com/browse/LIFERAYQA-8537
https://issues.liferay.com/browse/LIFERAYQA-8546
https://issues.liferay.com/browse/LIFERAYQA-8555