Merge "Refactored font-client-plugin-impl" into devel/master