cronyx,e1p2: merging for tag v7.0

Signed-off-by: Volokh Konstantin <volokh84@gmail.com>