master-bc-2369

https://issues.liferay.com/browse/LIFERAYQA-10950
https://issues.liferay.com/browse/LIFERAYQA-10713