Build #25:   Applied fixes from StyleCI on branch analysis-XVkR6q almost 10 years ago