master-bc-1672

https://issues.liferay.com/browse/LIFERAYQA-8936
https://issues.liferay.com/browse/LIFERAYQA-8741
https://issues.liferay.com/browse/LIFERAYQA-8930