merge corrections made on deploy-v0.9 branch