TFIVE-260 dictionary deployment stuff