PI-414 : Fixed bug with nested function calls, moved to future versioning scheme