Fix backward compatibility issues
Merge branch 'master' of github.com:modera/mcloud