Merged from free for upgrade