Applied to 5.2 as well