Merge "Fixes SFC deployments" into stable/brahmaputra