Support link update 1183 (follows UI fixes by Penar)