Also merged some updates to test-versioning.sh from main to correctly verify the version
Reference Issue #6171. (cherry picked from commit d843d61cc1)
d843d61cc1