Yes, I filed a separate bug report for those modified files - though they now don't get modified locally from this branch presumably because the changes have been committed.
I can confirm that this merge fixes bug #942831 for me, i.e. diamond opens successfully after being installed from packages that were built from the source.
Happy to approve assuming there's a conclusion about the unexpectedly modified files.
Yes, I filed a separate bug report for those modified files - though they now don't get modified locally from this branch presumably because the changes have been committed.
I can confirm that this merge fixes bug #942831 for me, i.e. diamond opens successfully after being installed from packages that were built from the source.
Happy to approve assuming there's a conclusion about the unexpectedly modified files.