feature issue#6082