Merge branch 't/decl_after_statement'