Manually merging fix for issue #1585
Adding check to see if contentidlist exists
Merge branch 'develop'