master-bc-2989

https://issues.liferay.com/browse/LIFERAYQA-12162
https://issues.liferay.com/browse/LIFERAYQA-12164