manually incorporate ICSM changes (to commit  dcf4e27, pull request #67)