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