Merge branch 'master' into development
deleted batch methods