Fix closes issue10403 - Let's not use members anymore.
21 files changed