Update ParserFunctions to master

Change-Id: Ied535cc2dacf9453fd56bcb394aa0a062c7cc21f