resolved-21477

resolved-21477