Merged from BETA