Merge branch 'xaig' into xc7mux