Merge changes from core (incl. version bump)