Merge "BUG-1274 OF issue with datapath-id"