Backport deploy fix/enhancement