Added changes from unmerged branches