Merge "Code review changes for Bugfix for lp904407, /extensions tests"