Fix sideloading with camelized attributes
Merge branch 'fix-sideloading-with-camelization'