Merge branch 'wishbone-port' into submission-mpw-3