This can't be here - we don't have an is_disabled status so this is a security issue
Merge branch 'refs/heads/2.3/develop' into 3.0/develop