making dev-freeze up to date with master