master-bc-2930

https://issues.liferay.com/browse/LIFERAYQA-11857
https://issues.liferay.com/browse/LIFERAYQA-11992