Revert "Merge master with development"