Merge pull request #5807 from Maoni0/obj_addr