CF-371 adding custom tags settings to cfe
Merge branch 'feature/CF-371' into feature/CF-370