Make sure we have p.a.layout >= 2.3.6.