Issue#2563 maintenance