Merge "Fix containers with expired objects deletion problem"