yap-app: incorporate other changes from trunk