Merge branch '2_5_to_2_6_bug_107'