TECH-2004 #resolve Resolved Issue