Conversion to non-static for extension, templates using factory class
Merge remote-tracking branch 'origin/master'