merge queue: embarking main (22d8c6e), #156, #159, #157 and #158 together

merge queue: embarking main (22d8c6e), #156, #159, #157 and #158 together #250