Updates to keep in sync with v17 prod and added SWWIF/bundled service utility.