[Added] protection to make sure filling doesn't stay over max

Change-Id: I42ea23eef0cdeb238f7d1c4fe135f7a7a2d46215
Merge "[Added] protection to make sure filling doesn't stay over max" into unstable