v12.3 bugfixes