consider versioned and unversioned stable ids

Jyothish Bhairequested to merge
resolver-gene into master

As per suggestion from Andy

Edited by Jyothish Bhai

Merge request reports