Merge a few commits from master (#1739)

Co-authored-by: Clemens Bastian <[email protected]>
Co-authored-by: Amacado <[email protected]>
Co-authored-by: Thomas Bui <[email protected]>

Author: 3 people