diff --git a/CHANGELOG.md b/CHANGELOG.md
index d348f8fa..9646ff2c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,8 @@ will consitute of a breaking change warranting a new major release:
 
 # [unreleased]
 
+# [v1.36.0] 2023-03-08
+
 ## Added
 
 - Star Tracker Assembly
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6bf2a95a..7cd09271 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,8 +10,8 @@
 cmake_minimum_required(VERSION 3.13)
 
 set(OBSW_VERSION_MAJOR 1)
-set(OBSW_VERSION_MINOR 35)
-set(OBSW_VERSION_REVISION 1)
+set(OBSW_VERSION_MINOR 36)
+set(OBSW_VERSION_REVISION 0)
 
 # set(CMAKE_VERBOSE TRUE)
 
diff --git a/mission/system/tree/system.cpp b/mission/system/tree/system.cpp
index d1b127d4..215f1b02 100644
--- a/mission/system/tree/system.cpp
+++ b/mission/system/tree/system.cpp
@@ -83,6 +83,8 @@ void buildSafeSequence(Subsystem& ss, ModeListEntry& eh) {
 
   // Do no track ACS for now because it might jump to detumble mode and back to safe as part of
   // normal operations.
+  // UPDATE: This could be re-enabled as soon as the detumble mode is a submode of
+  // ACS CTRL safe mode.
   // iht(objects::ACS_SUBSYSTEM, acs::AcsMode::SAFE, 0, EIVE_TABLE_SAFE_TGT.second, true);
   iht(objects::PL_SUBSYSTEM, OFF, 0, EIVE_TABLE_SAFE_TGT.second);
   check(ss.addTable(TableEntry(EIVE_TABLE_SAFE_TGT.first, &EIVE_TABLE_SAFE_TGT.second)), ctxc);
diff --git a/mission/system/tree/tcsModeTree.cpp b/mission/system/tree/tcsModeTree.cpp
index a3bd4319..b7188b17 100644
--- a/mission/system/tree/tcsModeTree.cpp
+++ b/mission/system/tree/tcsModeTree.cpp
@@ -71,7 +71,6 @@ void buildOffSequence(Subsystem& ss, ModeListEntry& eh) {
   iht(objects::TMP1075_HANDLER_IF_BOARD, OFF, 0, TCS_TABLE_OFF_TRANS_1.second);
   check(ss.addTable(TableEntry(TCS_TABLE_OFF_TRANS_1.first, &TCS_TABLE_OFF_TRANS_1.second)), ctxc);
 
-
   ihs(TCS_SEQUENCE_OFF.second, TCS_TABLE_OFF_TGT.first, 0, false);
   ihs(TCS_SEQUENCE_OFF.second, TCS_TABLE_OFF_TRANS_0.first, 0, false);
   ihs(TCS_SEQUENCE_OFF.second, TCS_TABLE_OFF_TRANS_1.first, 0, false);