Merge "BUG-612 : defensive parser for LSPA"