[12715m] Start of 5.4.1 support - Thanks to TC/CM