master
Made a few changes to the implementation and fixed types on comments
implementation #8267 (#17075)