Merge my SSL changes in from prod box