Bug fixes - Account captions and sort order of account
Merging changes