Merge branch 'feld-test.secret' into feld-warnings