Bug fixes to debugparams and bypass steps 2,3 in query
Resolved debugvars merge confilct