Merged iterX-refactor from repository JuantAldea