Merging changes to work over https