master-bc-3016

https://issues.liferay.com/browse/LIFERAYQA-12122
https://issues.liferay.com/browse/LIFERAYQA-12229
https://issues.liferay.com/browse/LIFERAYQA-12121