Merge properly with PR6170