version 21.4: small CRAY fix, save format change, cgi flag (was in 21.3 too)
Merge remote-tracking branch 'origin/jacob1's_mod' into jacob1's_mod