add these so they build
Merge remote-tracking branch 'origin/frankie-r6' into frankie-r6