Back port version reporting for to 0_15_x

[netmindz]

please create a new PR back porting the two PRs listed, using cherry-pick then new commits for any compatibility issues

Backport
#5093
And
#5111