Merge "Add NS post deal swagger generate logic"