Merge request + debut 1.26