Merge tag 'v2.5.1'

2.5.1
Make sure falsy value is kept for properties not predefined
Bump version
Merge branch 'release/2.5.2' into production