UAR-756 Changes necessary to fix all Sort By options
UAR-756 merging into development and solving merge conflicts