Merge "New Feature Request: Support for VIM Accounts"