Merge with latest updates from nuest/master