Updated master to v6.6.2b from upstream