Fixed set functions.
Cleanup.
Merge branch 'test' into dev