RID container serializer back-compatibility
Merge remote-tracking branch 'nuvolabase/hotfix-1.6.2' into hotfix-1.6.2
Merge remote-tracking branch 'nuvolabase/hotfix-1.6.2' into hotfix-1.6.2