ADD: handling of multiple kb versions
Merge remote-tracking branch 'origin/mjuliano' into integration