Sort Changes
Merge pull request #5927 from MustaphaTR/ra-building-sort

Fixes #5914