add changes from smb_dev #56

Closed deepanaishtaweera closed 4 days ago