master akallhoff-master-patch-12829