master-bc-1855

https://issues.liferay.com/browse/LIFERAYQA-9455
https://issues.liferay.com/browse/LIFERAYQA-9431
https://issues.liferay.com/browse/LIFERAYQA-9538