Merge "Revert "Patch 1431"" into dev/icn-v0.2.0