merged in recent changes from jellyfish