Bug prevent : Avoid id modification
Merge branch '0.9' of github.com:hubiquitus/hubiquitus-core into 0.9