#4: Code review.
Merge remote-tracking branch 'origin/feature/Sorting' into feature/Sorting