diff --git a/.bazelproject b/.bazelproject
new file mode 100644
index 00000000000..98917da0bc8
--- /dev/null
+++ b/.bazelproject
@@ -0,0 +1,13 @@
+directories:
+  # Add the directories you want added as source here
+  # By default, we've added your entire workspace ('.')
+  .
+
+targets:
+  # Add targets that reach the source code that you want to resolve here
+  # By default, we've added all targets in your workspace
+  //...
+
+additional_languages:
+  # Uncomment any additional languages you want supported
+  # dart
diff --git a/.gitignore b/.gitignore
index 16fba10d18d..3160872ab14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,9 @@ bazel-*
 **/.idea/dynamic.xml
 **/.idea/uiDesigner.xml
 
+# CLion Bazel files.
+.clwb
+
 # VScode files
 **/.vscode/tags
 
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 00000000000..15a15b218a2
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
+</project>
\ No newline at end of file