Merge recent commits from Albertz