Merge branch 'tp/lex-list' into ibm_next_2Xmerge_tmp