Merge "Separate dnd categories in a list" into rvc-dev