Merge branch 'reg_is_static_member'