Merge "Add support for general parameterisation for strings and ints."