[Updated] Prepare next release
[Updated] Refactor Rubix