porting updates to 9999 down to 0.6.1-r3 (no bump since they're minor cosmetics here - mostly helpful for -9999)