Merged change made on dev that fixes the messy sort view issue