Merge "Fix NPE in setGroupMetaData" into klp-dev