MERGED STRING API BACK WITH MASTER