gundam: Adapted changes in branch 'next2'