Added accountDRCRType to Account, did minor refactors
Merge commit '8a2a254919f4034b5e49ce4064074712774b1cc8'