Fix broken test on app-schema
Merge remote-tracking branch 'upstream/master'