Merge "Fix for Bug 511 (model + integration-test)"