Merge branch '3496_unsorted'