Merge branch 'amf/ote_ide' into sprint60