issue #21112: first light
issue #21112: polish
issue #21112: added todo