Edited comments
Merge branch 'devel' into identity_bugfix