Merging 304-move-apptype-field into master through Beanstalk.
Merging 304-move-apptype-field into master through Beanstalk.

miracle-as/kitos,os2kitos/kitos,miracle-as/kitos,miracle-as/kitos,miracle-as/kitos,os2kitos/kitos,os2kitos/kitos,os2kitos/kitos