Merge branch 'topic/func-desc-lkdtm' into next