Merge "Throw Exception for wrong valueType with API guard"