Update ParserFunctions to master

Change-Id: I185cf938ede040d4db499dadff1ea4e5289cac03