Merge branch 'liquidio-CN23XX-part-1'