Solve some concurrency problems in contextualization
Merge branch 'devel' of https://github.com/grycap/im into devel