Merge remote-tracking branch 'origin/eddie/split_shiftx' into xc7mux