Merge branch 'develop' into lbudginas/#359_add_account_operation_perspective