Merged in timh-callisto