Merge from Artifex branch