Merge branch 'koriakin/xc7nocarrymux' into xaig