Last updates for 5.2 before re-write