master-bc-1561

https://issues.liferay.com/browse/LIFERAYQA-8366
https://issues.liferay.com/browse/LIFERAYQA-8416
https://issues.liferay.com/browse/LIFERAYQA-8588