Address should be able to have al null complement
Merge branch 'release/0.2.18.1'