Code brought up to date for v1.92