23-09 final commit