Merge branch 'master' into dae_refactoring_process