Merge branch 'core44'