v1+v2 support - more readable coding style for optional args and call_ids
v1+v2 support - more readable coding style for optional args and call_ids

onelab-eu/sfa,onelab-eu/sfa,yippeecw/sfa,onelab-eu/sfa,yippeecw/sfa,yippeecw/sfa