Merge devel updates into master for larger testing