couple of merges from APP_HEAD