Enable diffusion with -m option
Merge branch 'develop'