Merge remote-tracking branch 'origin/apopiak-rename-exists-to-contains-key' into gav-composite-account