Made the ids unique
Updated docs
Merge branch 'release/0.22.7' into develop