master-bc-2573

https://issues.liferay.com/browse/LIFERAYQA-11354
https://issues.liferay.com/browse/LIFERAYQA-11376
https://issues.liferay.com/browse/LIFERAYQA-11355