Added some Updates from shop branch into core