Merge "Fixing issue with wrong stack being brought forward."