merge queue: checking main (6213e86), #307, #308, #309 and #311 together

merge queue: checking main (6213e86), #307, #308, #309 and #311 together #536