Merge pull request #2150 from guardian/aa/rm-stack-set

Merge pull request #2150 from guardian/aa/rm-stack-set #688