Instances duplicated in every save call issue fix.
Merge branch 'assessFlow' of https://github.com/AADevTeam/aaproto into assessFlow