merge latest from master and fix conflicts

1 job for pr-440 in 1 minute and 48 seconds (queued for 1 second)