Merge "Switch _map_instances from novang to novav21" into release/2019.2.0