Merged change from Pro Version 3.1.3