Manual merge of FALCON-38, retry of falcon actions