Merge branch '16-t-varop-mm' into 21-misc-cleanup
add to comment
Merge branch '21-misc-cleanup' into 22-remove-stuff