[ task #767 ]