merge Fwn production changes