marshal_by_key_only to prevent people causing security issues
fix required failing on values which are falsey
Merge branch 'develop' into feature/sqa_fk