Merge branch 'dev' into adjust-perm-array-logic