Merge "Remove useless iteration when debug mode" into devel/master