Rebasing to opower master
Additional changes from Astro work.