2.0

Implemented for tickets BK-748 and BK-749