Merge "Fix/add use cases under SMO package"