Merge branch 'work.finish_no_open' into for-next