Includes various improvements and enhancements to the transferred Base functionality
This will create a new commit in order to revert the existing changes.
