[Asa-dev] Current merge queue