Merge "Allow composd to run odrefresh"