Merge "set multi-stage flag in listener to log success"