Merge "Add a condition to ensure FontClient" into devel/master