merge
sochi fixes
sochi bg fixes
sochi bg fixes