Merge branch 'tr/fd-gotcha-fixes'