Merge branch 'master' into wip_alan_T5829_Messing_around_with_flutter_API