qtpim is dev only for now.
Merge branch 'dev' into 5.4