switches getters and setters
revert changes
Merge commit '4084355d56c7eee0837c8e18a64951504b4ba8dd' into HEAD