Add stuff removed from IC#42

gonzaponte wants to merge 3 commits intonext-exp:masternext-exp/ICAROS:masterfrom

gonzaponte:icaros-from-icgonzaponte/ICAROS:icaros-from-icCopy head branch name to clipboard