Improved AAE hash calculation.
Fixed more bugs in the role rename.
Merge branch 'test' into dev