Starting to backport changes in zeam