Fix for the use of an explicit Iex namespace vs the macro IEX_NAMESPACE
Merge branch 'develop' into ILM_sync