Revert "Revert "developing branch""

This reverts commit 2a3714b8715c77839fd0dec2627d9ee2e487d9ed.