Merge commit 'c8da65a' into new-open