Merged from apikeybranch