Build #27:   refactoring on branch development over 9 years ago