Merge branch 'master' into header_extend_fix
undo dist changes