Changes made in Cing main repo, back to space150-cing fork