Generalized get and set.
Merge branch 'test' into dev