Revert "Revert "Develpment updates""

This reverts commit 38a1e96e17603a9145c95fec39418352fa7aa1e6.