Merge branch 'dev_itkonma'