diff --git a/Gemfile.lock b/Gemfile.lock
index b883f754a30..c2241aaa607 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -111,7 +111,7 @@ GEM
     tilt (2.0.10)
     tzinfo (2.0.2)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2019.3)
+    tzinfo-data (1.2020.1)
       tzinfo (>= 1.0.0)
     unicode-display_width (1.7.0)
 
diff --git a/_config.yml b/_config.yml
index d3d24e66756..ad3cb690e42 100644
--- a/_config.yml
+++ b/_config.yml
@@ -101,8 +101,8 @@ social:
 # Home Assistant release details
 current_major_version: 0
 current_minor_version: 108
-current_patch_version: 8
-date_released: 2020-04-22
+current_patch_version: 9
+date_released: 2020-04-24
 
 # Either # or the anchor link to latest release notes in the blog post.
 # Must be prefixed with a # and have double quotes around it.
diff --git a/source/_cookbook/configuration_yaml_by_ubhits.markdown b/source/_cookbook/configuration_yaml_by_ubhits.markdown
new file mode 100644
index 00000000000..915cc98a05e
--- /dev/null
+++ b/source/_cookbook/configuration_yaml_by_ubhits.markdown
@@ -0,0 +1,6 @@
+---
+title: "Configuration.yaml by ubhits (HA 'Steroids' Config)"
+description: ""
+ha_category: Example configuration.yaml
+ha_external_link: https://github.com/UbhiTS/ha-config-ataraxis
+---
diff --git a/source/_docs/configuration/securing.markdown b/source/_docs/configuration/securing.markdown
index 8ec666a8cab..0ae6d29ecc0 100644
--- a/source/_docs/configuration/securing.markdown
+++ b/source/_docs/configuration/securing.markdown
@@ -23,5 +23,5 @@ As well as the above we advise that you consider the following to improve securi
 
 - For systems that use SSH set `PermitRootLogin no` in your sshd configuration (usually `/etc/ssh/sshd_config`) and to use SSH keys for authentication instead of passwords. This is particularly important if you enable remote access to your SSH services.
 - Lock down the host following good practice guidance, for example:
-  * [Securing Debian Manual](https://www.debian.org/doc/manuals/securing-debian-howto/index.en.html) (this also applies to Raspbian)
+  * [Securing Debian Manual](https://www.debian.org/doc/manuals/securing-debian-manual/index.en.html) (this also applies to Raspbian)
   * [Red Hat Enterprise Linux 7 Security Guide](https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/7/pdf/Security_Guide/Red_Hat_Enterprise_Linux-7-Security_Guide-en-US.pdf), [CIS Red Hat Enterprise Linux 7 Benchmark](https://benchmarks.cisecurity.org/tools2/linux/CIS_Red_Hat_Enterprise_Linux_7_Benchmark_v1.0.0.pdf)
diff --git a/source/_docs/configuration/splitting_configuration.markdown b/source/_docs/configuration/splitting_configuration.markdown
index ec01ded7592..8762fea4bfb 100644
--- a/source/_docs/configuration/splitting_configuration.markdown
+++ b/source/_docs/configuration/splitting_configuration.markdown
@@ -72,7 +72,7 @@ device_tracker.yaml
 customize.yaml
 ```
 
-`automation.yaml` will hold all the automation integration details. `zones.yaml` will hold the zone integration details and so forth. These files can be called anything but giving them names that match their function will make things easier to keep track of.
+`automation.yaml` will hold all the automation integration details. `zone.yaml` will hold the zone integration details and so forth. These files can be called anything but giving them names that match their function will make things easier to keep track of.
 
 Inside the base configuration file add the following entries:
 
diff --git a/source/_integrations/currencylayer.markdown b/source/_integrations/currencylayer.markdown
index 692e772041c..228d282f348 100644
--- a/source/_integrations/currencylayer.markdown
+++ b/source/_integrations/currencylayer.markdown
@@ -3,7 +3,6 @@ title: currencylayer
 description: Instructions on integrating exchange rates from https://currencylayer.com/ within Home Assistant.
 ha_category:
   - Finance
-logo: currencylayer.png
 ha_iot_class: Cloud Polling
 ha_release: 0.32
 ha_domain: currencylayer
diff --git a/source/_integrations/default_config.markdown b/source/_integrations/default_config.markdown
index 546e3186420..14e4e09e28a 100644
--- a/source/_integrations/default_config.markdown
+++ b/source/_integrations/default_config.markdown
@@ -14,6 +14,11 @@ This integration is a meta-component and configures a default set of integration
 - [Configuration](/integrations/config/)
 - [Frontend](/integrations/frontend/)
 - [History](/integrations/history/)
+- [Input boolean](/integrations/input_boolean)
+- [Input datetime](/integrations/input_datetime)
+- [Input number](/integrations/input_number)
+- [Input select](/integrations/input_select)
+- [Input text](/integrations/input_text)
 - [Logbook](/integrations/logbook/)
 - [Map](/integrations/map/)
 - [Mobile App Support](/integrations/mobile_app/)
diff --git a/source/_integrations/denonavr.markdown b/source/_integrations/denonavr.markdown
index 96d481f2b4f..a973a839b5d 100644
--- a/source/_integrations/denonavr.markdown
+++ b/source/_integrations/denonavr.markdown
@@ -19,12 +19,14 @@ Known supported devices:
 - Denon AVR-X1500H
 - Denon AVR-X2000
 - Denon AVR-X2100W
+- Denon AVR-X3400H
 - Denon AVR-X4100W
 - Denon AVR-X4300H
 - Denon AVR-X4500H
 - Denon AVR-1912
 - Denon AVR-2312CI
 - Denon AVR-3311CI
+- Denon AVR-3312
 - Denon AVR-4810
 - Denon AVR-S750H
 - Marantz M-CR510
@@ -38,6 +40,8 @@ Known supported devices:
 - Other Denon AVR receivers (untested)
 - Marantz receivers (experimental)
 
+If your model is not on the list then give it a test, if everything works correctly then add it to the list by clicking on the **Edit this page on GitHub** link above.
+
 <div class='note warning'>
 If you have something else using the IP controller for your Denon AVR 3808CI, such as your URC controller, it will not work! There is either a bug or security issue with some models where only one device could be controlling the IP functionality.
 </div>
diff --git a/source/_integrations/gitter.markdown b/source/_integrations/gitter.markdown
index 714aa4035ac..0a76d463cce 100644
--- a/source/_integrations/gitter.markdown
+++ b/source/_integrations/gitter.markdown
@@ -1,7 +1,6 @@
 ---
 title: Gitter
 description: Instructions on how to integrate a Gitter room sensor with Home Assistant
-logo: gitter.png
 ha_category:
   - Sensor
 ha_release: 0.47
diff --git a/source/_integrations/itach.markdown b/source/_integrations/itach.markdown
index 34707e82c13..fb81081aef5 100644
--- a/source/_integrations/itach.markdown
+++ b/source/_integrations/itach.markdown
@@ -1,7 +1,6 @@
 ---
 title: Global Caché iTach TCP/IP to IR
 description: Instructions on how to integrate a Global Caché iTach IP2IR gateway into Home Assistant.
-logo: globalcache.png
 ha_category:
   - Remote
 ha_iot_class: Assumed State
diff --git a/source/_integrations/kira.markdown b/source/_integrations/kira.markdown
index f5c38667649..345296f7a62 100644
--- a/source/_integrations/kira.markdown
+++ b/source/_integrations/kira.markdown
@@ -1,7 +1,6 @@
 ---
 title: Kira
 description: Instructions on how to integrate Keene Electronics IR over IP modules (Kira) into Home Assistant.
-logo: keene.png
 ha_category:
   - Hub
   - Remote
diff --git a/source/_integrations/switch.command_line.markdown b/source/_integrations/switch.command_line.markdown
index 16551f82d0f..a0c9b95d6a9 100644
--- a/source/_integrations/switch.command_line.markdown
+++ b/source/_integrations/switch.command_line.markdown
@@ -86,14 +86,14 @@ which is controllable through REST.
 ```yaml
 # Example configuration.yaml entry
 switch:
-  platform: command_line
-  switches:
-    arest_pin_four:
-      command_on: "/usr/bin/curl -X GET http://192.168.1.10/digital/4/1"
-      command_off: "/usr/bin/curl -X GET http://192.168.1.10/digital/4/0"
-      command_state: "/usr/bin/curl -X GET http://192.168.1.10/digital/4"
-      value_template: '{% raw %}{{ value == "1" }}{% endraw %}'
-      friendly_name: Kitchen Lightswitch
+  - platform: command_line
+    switches:
+      arest_pin_four:
+        command_on: "/usr/bin/curl -X GET http://192.168.1.10/digital/4/1"
+        command_off: "/usr/bin/curl -X GET http://192.168.1.10/digital/4/0"
+        command_state: "/usr/bin/curl -X GET http://192.168.1.10/digital/4"
+        value_template: '{% raw %}{{ value == "1" }}{% endraw %}'
+        friendly_name: Kitchen Lightswitch
 ```
 
 Given this example, in the UI one would see the `friendly_name` of
@@ -112,10 +112,10 @@ This switch will shutdown your host immediately, there will be no confirmation.
 ```yaml
 # Example configuration.yaml entry
 switch:
-  platform: command_line
-  switches:
-    home_assistant_system_shutdown:
-      command_off: "/usr/sbin/poweroff"
+  - platform: command_line
+    switches:
+      home_assistant_system_shutdown:
+        command_off: "/usr/sbin/poweroff"
 ```
 
 ### Control your VLC player
@@ -126,11 +126,11 @@ This switch will control a local VLC media player
 ```yaml
 # Example configuration.yaml entry
 switch:
-  platform: command_line
-  switches:
-    vlc:
-      command_on: "cvlc 1.mp3 vlc://quit &"
-      command_off: "pkill vlc"
+  - platform: command_line
+    switches:
+      vlc:
+        command_on: "cvlc 1.mp3 vlc://quit &"
+        command_off: "pkill vlc"
 ```
 
 ### Control Foscam Motion Sensor
@@ -143,13 +143,13 @@ which checks the current state of motion detection.
 ```yaml
 # Example configuration.yaml entry
 switch:
-  platform: command_line
-  switches:
-    foscam_motion:
-      command_on: 'curl -k "https://ipaddress:443/cgi-bin/CGIProxy.fcgi?cmd=setMotionDetectConfig&isEnable=1&usr=admin&pwd=password"'
-      command_off: 'curl -k "https://ipaddress:443/cgi-bin/CGIProxy.fcgi?cmd=setMotionDetectConfig&isEnable=0&usr=admin&pwd=password"'
-      command_state: 'curl -k --silent "https://ipaddress:443/cgi-bin/CGIProxy.fcgi?cmd=getMotionDetectConfig&usr=admin&pwd=password" | grep -oP "(?<=isEnable>).*?(?=</isEnable>)"'
-      value_template: {% raw %}'{{ value == "1" }}'{% endraw %}
+  - platform: command_line
+    switches:
+      foscam_motion:
+        command_on: 'curl -k "https://ipaddress:443/cgi-bin/CGIProxy.fcgi?cmd=setMotionDetectConfig&isEnable=1&usr=admin&pwd=password"'
+        command_off: 'curl -k "https://ipaddress:443/cgi-bin/CGIProxy.fcgi?cmd=setMotionDetectConfig&isEnable=0&usr=admin&pwd=password"'
+        command_state: 'curl -k --silent "https://ipaddress:443/cgi-bin/CGIProxy.fcgi?cmd=getMotionDetectConfig&usr=admin&pwd=password" | grep -oP "(?<=isEnable>).*?(?=</isEnable>)"'
+        value_template: {% raw %}'{{ value == "1" }}'{% endraw %}
 ```
 
 - Replace admin and password with an "Admin" privileged Foscam user
diff --git a/source/_integrations/telnet.markdown b/source/_integrations/telnet.markdown
index 26696454e4d..da958068bfa 100644
--- a/source/_integrations/telnet.markdown
+++ b/source/_integrations/telnet.markdown
@@ -16,16 +16,16 @@ To enable this switch, add the following lines to your `configuration.yaml` file
 ```yaml
 # Example configuration.yaml entry
 switch:
-  platform: telnet
-  switches:
-    projector:
-      resource: THE_IP_ADDRESS
-      port: 4002
-      command_on: "PWR ON"
-      command_off: "PWR OFF"
-      command_state: "PWR?"
-      value_template: '{{ value == "PWR=01" }}'
-      timeout: 0.9
+  - platform: telnet
+    switches:
+      projector:
+        resource: THE_IP_ADDRESS
+        port: 4002
+        command_on: "PWR ON"
+        command_off: "PWR OFF"
+        command_state: "PWR?"
+        value_template: '{{ value == "PWR=01" }}'
+        timeout: 0.9
 ```
 {% endraw %}
 
diff --git a/source/_integrations/tuya.markdown b/source/_integrations/tuya.markdown
index 2994a3ee577..b3658811662 100644
--- a/source/_integrations/tuya.markdown
+++ b/source/_integrations/tuya.markdown
@@ -14,7 +14,7 @@ ha_release: 0.74
 ha_domain: tuya
 ---
 
-The `tuya` integration is the main integration to integrate all [Tuya Smart](https://www.tuya.com) related platforms. You will need your Tuya account information (username, password and account country code) to discover and control devices which related to your account.
+The `tuya` integration is the main integration to integrate all [Tuya Smart](https://www.tuya.com) related platforms, except the Zigbee hub. You will need your Tuya account information (username, password and account country code) to discover and control devices which related to your account.
 
 There is currently support for the following device types within Home Assistant:
 
diff --git a/source/_integrations/zwave.markdown b/source/_integrations/zwave.markdown
index 4544965cf3c..e22038fa17b 100644
--- a/source/_integrations/zwave.markdown
+++ b/source/_integrations/zwave.markdown
@@ -54,13 +54,6 @@ If the thermostat supports different operating modes, you will get one thermosta
 
 </div>
 
-To enable the climate integration for your Z-Wave network, add the following to your `configuration.yaml` file.
-
-```yaml
-climate:
-  - platform: zwave
-```
-
 Once enabled, any Z-Wave climate devices will be available to Home Assistant. Multiple entities may be created. The following entities are created for a Remotec ZXT-120.
 
 - `climate.remotec_zxt120_heating_1_id`: Allows you to control the connected device. See below for examples.
diff --git a/source/_posts/2020-04-08-release-108.markdown b/source/_posts/2020-04-08-release-108.markdown
index 9b9d0530cdb..ed2a6a4b9d3 100644
--- a/source/_posts/2020-04-08-release-108.markdown
+++ b/source/_posts/2020-04-08-release-108.markdown
@@ -577,6 +577,12 @@ These integrations have been removed. The websites for both have changed, causin
 [@pvizeli]: https://github.com/pvizeli
 [cloud docs]: /integrations/cloud/
 
+## Release 0.108.9 - April 24
+
+- Fix Google Assistant devices being disconnected from their rooms ([@balloob] - [#34622])
+
+[#34622]: https://github.com/home-assistant/core/pull/34622
+
 ## All changes
 
 <details>