master-bc-2735

https://issues.liferay.com/browse/LIFERAYQA-11286
https://issues.liferay.com/browse/LIFERAYQA-11650