wip
wip
rel_2_6_3
Merge branch 'master' into moret