Merge branch 'Fabii547-patch-55' into 3.0