Merging Vickrams changes to wishradio_hosted from master