Form default address fixes
Merge branch 'develop'