Merge "Fix index out of bounds when removing deferred containers" into rvc-dev