Merge tag '2.9.2' into develop

tagging 2.9.2
handle unexpected data better
Merge branch 'release/2.9.2'