Adding param check for objectid
Merge branch 'develop'