Some fixes to wrapper API

Closed Amir MOHAMMADI requested to merge wrapper-api2 into wrapper-api

Merge request reports