Merge last ITER changes

resolves #553 - Postgres RDB Archive access can run out of memory