Fixed the build and regression bug. Attached interdiff for same. please review