Merge branch 'refactoring-of-ibmvnic-code'