Merge "Enable https endpoint for SMS"