Almost ready to replace stable release
Ready to merge back into stable release