intelliactive backport from 3.1