Merge branch #smgc/notdiamond2api' into 'hstz/noapi' 411f944 Running verified hstz commited on 4 days ago