Merge "Update default face implementation"