Added deployment id in query option
Merge with master