Updating master with fix to static methods