412.07 merge dev branch (425.01) - Changes to config_app table and defines