Merge Coreupdate with Master Branch