Milestone changed to use utils::id everywhere
Reassigned to @morignot2011
Milestone changed to clean code