v31-2 commit, update for igas v55