master-bc-2306

https://issues.liferay.com/browse/LIFERAYQA-10630
https://issues.liferay.com/browse/LIFERAYQA-10700