Production saltmaster changes