fix
alldiff but
Merge branch 'feature-adcond' into develop