Fixed issue with 'kvarg' not parsed correctly in 'line'
Fixed issue with 'kvarg' not parsed correctly in 'line'

Merged lib/plugin servers