* rebranch #refs 3 with code more clean to apply.

* rebranch #refs 3 with code more clean to apply.