Feature/2602 remove strict dependency on leap.common 2