Merge commit '1276d1e1a1b128f7093a3021d3f6bc27afa80d23' into amd64