Fixed role creation for stacks.
Merge branch 'test' into dev