Merge "Update custom cling params" into jb-mr1-dev