Merge changes from topic 'qaim-dfs-iterator'