[tor-commits] [lego/develop] Merge commit 'e9e737e0c6ed288af07efc179f488ddf2eb504ce' into vertical