Dottypost

Fixes RT #73156 and RT #73640 as per S03