Merge pull request #823 from leider/master

FIX: fine-tuning for the interest-cloud