Remove unused variable 'addr'
Merge branch 'develop' into intrinsic_security