2.0

Resolved BK-765