issue #20040: moved dispatch functions to more appropriate models