The changes from dev bundle 0.3.41, merged in