@mema82, @kimkvn commit 3 in dojo