Merge "maintenance: Add waiting for compilation"