Merge branch 'develop' into unify_derivative_views