Merge "POC-verify from manual trigger to patch-submitted"