Merge branch '2676_learn_f13-f20_fix'