Merge branch 'explicit-addressing' into 'develop'