merged changes made during switch to production