Bug fix 2462 and changes for no feedback mode(Editor)
merged avaneesh to sachin