Provide upgrade code after changes done for Ticket #3441
Fix #3521, show correct field descr