Quick suggestions for 5.2 (probably final push from my side)