Dev freeze fixstravaganza

fixes #7452
fixes #7454
fixes #7396