Merge remote-tracking branch 'DAVA/development' into development_manualbatch