Few improvement of 7QD
Merge branch 'feauture-pe' into develop