Few changes related to the idea12 migration