Merge branch '16-t-varop-mm' into 21-apply-dots
fix missing setting of no_dots, cleanup
Merge branch '21-apply-dots' into 24