am 615c690d: am 1905302f: am c97bc443: Merge "Fix parameter parsing in renderer"

* commit '615c690d0f99eb10ca5c66c8fdd839a354063fb5':
  Fix parameter parsing in renderer