Separate load_functions from load_triggers tasks
Merge branch '2.0'