master-bc-1654

https://issues.liferay.com/browse/LIFERAYQA-8831
https://issues.liferay.com/browse/LIFERAYQA-8830
https://issues.liferay.com/browse/LIFERAYQA-8876
https://issues.liferay.com/browse/LIFERAYQA-8855