Merge pull request #3301 from techee/integration_fix2