master-bc-2286

https://issues.liferay.com/browse/LIFERAYQA-10654
https://issues.liferay.com/browse/LIFERAYQA-10670