Update to upstream version 3.6.12
PR: 237257 Submitted by: ronald-lists@klop.ws Approved by: dev@dudu.ro (maintainer)