bitsane minor edits merge #1746

[ci skip]
This tag has no release notes.