ADSTSF:kitkat Merge changes from ThankYouMario:kitkat