Merge remote-tracking branch 'ovl/misc' into work.misc