Merging development up to install_widget_prototype branch

Updating sources on branch from latest development.