UAR-756 Changes necessary to fix all Sort By options
UAR-756 Merge branch into development (3rd attempt) and solving merge conflicts