Merge development into PeterBranch to adjust ShopScript