Merge "Update stack design with vertical offset"