Merge "Add ability to wait jobs triggered by the same trigger"