Merge A collected number of enhancements from Jolle-C