Updated to latest mosca version
Merge branch 'master' into dev
Minor updates to have a better debug