Merge "Re-merge "Add support for custom manta cling"" into jb-mr1-dev