master-bc-2864

https://issues.liferay.com/browse/LIFERAYQA-11974
https://issues.liferay.com/browse/LIFERAYQA-11986
https://issues.liferay.com/browse/LIFERAYQA-11989