Merge "Add flexibility for Stack creation"