Correctly identify standalone AA in export json
version bump to 2.4.0
Merge release 2.4.0 into master
Backported release 2.4.0 into develop