optimistation for 13 dm
Merge branch '13-3-dm-optimistation' into develop