Webui code sync
Merge pull request #469 from Ankitja/R1.06

Webui code sync