Revert "Version 3.0f"

This reverts commit bc6087e0df155d298e6693eec0a9231f1ac24c52.
Revert "Revert "Version 3.0f""

This reverts commit 07a76ac75b6cb82af70cb3c08e848ddfb84e61f8.
Merge branch 'version3'