Up work2

Merging latest development from UP's branch to Master