Fixed set for stacks
Merge branch 'test' into dev