Do not create last activated array when not needed
Merge branch 'master' into ST3