Rl17 - resolved issues with list sorting and possible upgrade side effects.