Merge branch 'develop'
Fix bug with group serialization to disk
(cherry picked from commit b60aec8)
Merge commit '7e70a74611ddb1b33498e0f5195e24c07b214a0a'
Merge branch 'develop'