-BZ-1174894 and BZ-1175623: sort revision