GII sub-modules support [skip ci]

See #871 and #983.