issue: 2457 Further attempts in harmonization, changing function instances.