Merge minor changes to ensure static library build compatibility

5 jobs for merge-from-ReForm in 6 minutes and 47 seconds (queued for 1 second)