Merge "Fix nexus-iq issues"