Apply cleaning patch
Fix flow step listener test