merge latest development sprint into master