FS-5019 --resolve  I would rather have this fix in the core... But in the mean this, this look good.  Thanks