Merged in d6543