merge queue: embarking 0.12.x (1587bb8), #535, #537, #540, #539 and #538 together

merge queue: embarking 0.12.x (1587bb8), #535, #537, #540, #539 and #538 together #834