Set fields default to private
Merge branch 'ai2788' into cirandas