Merge changes from Pro; release 8.0.10