#669021 please add more documentation