GIA-3147 - Fix branch merge conflicts
GIA-3147 - Fix branch merge conflicts 2