Feature/suffix versioning support

PR for suffix versioning support feature