Merge "Fix FINISHED/CANCELED step filtered out incorrectly" into main