Issue#2577 maintenance