БАГ 2207
Merge branch 'BUG2207' into dev