[DF-3756] Preparation to merge to fog branch