master-bc-2817

https://issues.liferay.com/browse/LIFERAYQA-11831
https://issues.liferay.com/browse/LIFERAYQA-11832
https://issues.liferay.com/browse/LIFERAYQA-11835