Merge "[DO NOT MERGE]Fix IndexOutOfBoundsException for TDA stack"