2.1.21 in development.
Fix for #619 - #617 - #627
In progress #626