add ql3 changes
Merge master
Merge branch 'ql3'
Adjust dput targets/branch names