master-bc-1726

https://issues.liferay.com/browse/LIFERAYQA-9046
https://issues.liferay.com/browse/LIFERAYQA-9102