Merge branch 'hqs' into try-to-merge-all
conflict fixed
Merge branch 'try-to-merge-all' into Hubert