Update pkg-reorg branch with latest master