master-bc-1221

https://issues.liferay.com/browse/LIFERAYQA-7789
https://issues.liferay.com/browse/LIFERAYQA-7781
https://issues.liferay.com/browse/LIFERAYQA-7798