this is where the 1.4.21 platform_version was coming from!
Merge branch 'master' into v1.4