Merged with jemma upstream