Merge latest dev changes into dasein upstream merge branch