Latest Pro and OSS changes