Merge branch 'fix-nested-serializers-with-renamed-fields' into kx