Merge "add more cases to AlmostFull case" into jb-mr1-dev