diff --git a/core/java/src/net/i2p/data/i2cp/CreateLeaseSetMessage.java b/core/java/src/net/i2p/data/i2cp/CreateLeaseSetMessage.java
index 0cbb854ffda4c8ec74937f4d7ae1765743a19ebb..d7c55e53bd609aa9919696ea61b457fa6378c655 100644
--- a/core/java/src/net/i2p/data/i2cp/CreateLeaseSetMessage.java
+++ b/core/java/src/net/i2p/data/i2cp/CreateLeaseSetMessage.java
@@ -38,6 +38,11 @@ public class CreateLeaseSetMessage extends I2CPMessageImpl {
         return _sessionId;
     }
 
+    /**
+     * Return the SessionId for this message.
+     *
+     * @since 0.9.21
+     */
     @Override
     public SessionId sessionId() {
         return _sessionId;
diff --git a/core/java/src/net/i2p/data/i2cp/DestroySessionMessage.java b/core/java/src/net/i2p/data/i2cp/DestroySessionMessage.java
index 4275863e11e09f102b47f19c7cc761bc5bce62e8..67090011f66f2771fdf9a7b119c9b55c2fca5631 100644
--- a/core/java/src/net/i2p/data/i2cp/DestroySessionMessage.java
+++ b/core/java/src/net/i2p/data/i2cp/DestroySessionMessage.java
@@ -35,7 +35,7 @@ public class DestroySessionMessage extends I2CPMessageImpl {
     /**
      * Return the SessionId for this message.
      *
-     * @since 0.9.19
+     * @since 0.9.21
      */
     @Override
     public SessionId sessionId() {
diff --git a/core/java/src/net/i2p/data/i2cp/HostLookupMessage.java b/core/java/src/net/i2p/data/i2cp/HostLookupMessage.java
index c4405f90a9249688ab337f031714761e7b2ed169..66835ef9f54224c108aadb04d3ac8ebf1aa91f0e 100644
--- a/core/java/src/net/i2p/data/i2cp/HostLookupMessage.java
+++ b/core/java/src/net/i2p/data/i2cp/HostLookupMessage.java
@@ -79,7 +79,7 @@ public class HostLookupMessage extends I2CPMessageImpl {
     /**
      * Return the SessionId for this message.
      *
-     * @since 0.9.19
+     * @since 0.9.21
      */
     @Override
     public SessionId sessionId() {
diff --git a/core/java/src/net/i2p/data/i2cp/HostReplyMessage.java b/core/java/src/net/i2p/data/i2cp/HostReplyMessage.java
index b350f225ac4c86ded6bc67b8aeaa44aebf1f7ac2..ad182d6a623f48b3d3f1aa4f721a85166d8e929b 100644
--- a/core/java/src/net/i2p/data/i2cp/HostReplyMessage.java
+++ b/core/java/src/net/i2p/data/i2cp/HostReplyMessage.java
@@ -76,7 +76,7 @@ public class HostReplyMessage extends I2CPMessageImpl {
     /**
      * Return the SessionId for this message.
      *
-     * @since 0.9.19
+     * @since 0.9.21
      */
     @Override
     public SessionId sessionId() {
diff --git a/core/java/src/net/i2p/data/i2cp/I2CPMessage.java b/core/java/src/net/i2p/data/i2cp/I2CPMessage.java
index 58d31201319b51ee0c92aa172523768dbebe3814..3cc7da5039b20e0ac537dd410b5cabb71c86465c 100644
--- a/core/java/src/net/i2p/data/i2cp/I2CPMessage.java
+++ b/core/java/src/net/i2p/data/i2cp/I2CPMessage.java
@@ -73,7 +73,7 @@ public interface I2CPMessage extends DataStructure {
      * some return a long, so we define a new method here.
      *
      * @return SessionId or null if this message type does not include a SessionId
-     * @since 0.9.19
+     * @since 0.9.21
      */
     public SessionId sessionId();
 }
diff --git a/core/java/src/net/i2p/data/i2cp/I2CPMessageImpl.java b/core/java/src/net/i2p/data/i2cp/I2CPMessageImpl.java
index 19b8d1cc3dd33437bbbe27bef5a9a218a039f4b1..ff597559fb9e8f3074eba27fcfa71a5520809cf8 100644
--- a/core/java/src/net/i2p/data/i2cp/I2CPMessageImpl.java
+++ b/core/java/src/net/i2p/data/i2cp/I2CPMessageImpl.java
@@ -135,7 +135,7 @@ public abstract class I2CPMessageImpl extends DataStructureImpl implements I2CPM
      * some return a long, so we define a new method here.
      *
      * @return null always. Extending classes with a SessionId must override.
-     * @since 0.9.19
+     * @since 0.9.21
      */
     public SessionId sessionId() { return null; }
 }
diff --git a/core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java b/core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java
index e5969a0a8ea5dcf5ef65392d27fdabb2d94d744d..c7b78c460080cfe1e282da539e5a76436bf52bb0 100644
--- a/core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java
+++ b/core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java
@@ -40,7 +40,7 @@ public class MessagePayloadMessage extends I2CPMessageImpl {
     /**
      * Return the SessionId for this message.
      *
-     * @since 0.9.19
+     * @since 0.9.21
      */
     @Override
     public SessionId sessionId() {
diff --git a/core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java b/core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java
index 182caca9e4478f072f0f7af117e237079e7752e3..401fa96f0f8d02dd16bd82cb0241ed02b129037e 100644
--- a/core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java
+++ b/core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java
@@ -196,7 +196,7 @@ public class MessageStatusMessage extends I2CPMessageImpl {
     /**
      * Return the SessionId for this message.
      *
-     * @since 0.9.19
+     * @since 0.9.21
      */
     @Override
     public SessionId sessionId() {
diff --git a/core/java/src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java b/core/java/src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java
index 744dfd356c1fdb694d47a9fd307112b76a510352..03e3e4aae45903cc93116934da19367dfa1aada9 100644
--- a/core/java/src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java
+++ b/core/java/src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java
@@ -39,7 +39,7 @@ public class ReceiveMessageBeginMessage extends I2CPMessageImpl {
     /**
      * Return the SessionId for this message.
      *
-     * @since 0.9.19
+     * @since 0.9.21
      */
     @Override
     public SessionId sessionId() {
diff --git a/core/java/src/net/i2p/data/i2cp/ReceiveMessageEndMessage.java b/core/java/src/net/i2p/data/i2cp/ReceiveMessageEndMessage.java
index 5be2bbfeb84c6ae4d5656c1a61f581756409ff2b..accf9dbe3d5a48db71da14489a473dc3cce2a4ba 100644
--- a/core/java/src/net/i2p/data/i2cp/ReceiveMessageEndMessage.java
+++ b/core/java/src/net/i2p/data/i2cp/ReceiveMessageEndMessage.java
@@ -38,7 +38,7 @@ public class ReceiveMessageEndMessage extends I2CPMessageImpl {
     /**
      * Return the SessionId for this message.
      *
-     * @since 0.9.19
+     * @since 0.9.21
      */
     @Override
     public SessionId sessionId() {
diff --git a/core/java/src/net/i2p/data/i2cp/ReconfigureSessionMessage.java b/core/java/src/net/i2p/data/i2cp/ReconfigureSessionMessage.java
index 8f80f531bd7f721a1dc81fdfa0bd28e19f6063d4..7532af3580679fa01ce8ea9fd76780d0cd46f366 100644
--- a/core/java/src/net/i2p/data/i2cp/ReconfigureSessionMessage.java
+++ b/core/java/src/net/i2p/data/i2cp/ReconfigureSessionMessage.java
@@ -36,7 +36,7 @@ public class ReconfigureSessionMessage extends I2CPMessageImpl {
     /**
      * Return the SessionId for this message.
      *
-     * @since 0.9.19
+     * @since 0.9.21
      */
     @Override
     public SessionId sessionId() {
diff --git a/core/java/src/net/i2p/data/i2cp/ReportAbuseMessage.java b/core/java/src/net/i2p/data/i2cp/ReportAbuseMessage.java
index cfdbd6cfef7075bfaa49a4a3b07f59bd53e7603a..4118ac322b9e7821c365ebd72d712ed9992201b7 100644
--- a/core/java/src/net/i2p/data/i2cp/ReportAbuseMessage.java
+++ b/core/java/src/net/i2p/data/i2cp/ReportAbuseMessage.java
@@ -38,7 +38,7 @@ public class ReportAbuseMessage extends I2CPMessageImpl {
     /**
      * Return the SessionId for this message.
      *
-     * @since 0.9.19
+     * @since 0.9.21
      */
     @Override
     public SessionId sessionId() {
diff --git a/core/java/src/net/i2p/data/i2cp/RequestLeaseSetMessage.java b/core/java/src/net/i2p/data/i2cp/RequestLeaseSetMessage.java
index 15d9b70ec5d10d5b77aad9bd2e0c93b80c70438a..b972fab38b56d1dd72b4db10ae3eb18f5c401bbc 100644
--- a/core/java/src/net/i2p/data/i2cp/RequestLeaseSetMessage.java
+++ b/core/java/src/net/i2p/data/i2cp/RequestLeaseSetMessage.java
@@ -48,7 +48,7 @@ public class RequestLeaseSetMessage extends I2CPMessageImpl {
     /**
      * Return the SessionId for this message.
      *
-     * @since 0.9.19
+     * @since 0.9.21
      */
     @Override
     public SessionId sessionId() {
diff --git a/core/java/src/net/i2p/data/i2cp/RequestVariableLeaseSetMessage.java b/core/java/src/net/i2p/data/i2cp/RequestVariableLeaseSetMessage.java
index 3edd06171a9daddf8ad200deef2b29f63dd53cd2..6d172c9195601289ec37b478351eedb782d98b43 100644
--- a/core/java/src/net/i2p/data/i2cp/RequestVariableLeaseSetMessage.java
+++ b/core/java/src/net/i2p/data/i2cp/RequestVariableLeaseSetMessage.java
@@ -58,7 +58,7 @@ public class RequestVariableLeaseSetMessage extends I2CPMessageImpl {
     /**
      * Return the SessionId for this message.
      *
-     * @since 0.9.19
+     * @since 0.9.21
      */
     @Override
     public SessionId sessionId() {
diff --git a/core/java/src/net/i2p/data/i2cp/SendMessageMessage.java b/core/java/src/net/i2p/data/i2cp/SendMessageMessage.java
index 4515f3872e552646f54931167272cbff9309d3ce..0a6e69b3a05554143b20f20e1454f62a33be6ee7 100644
--- a/core/java/src/net/i2p/data/i2cp/SendMessageMessage.java
+++ b/core/java/src/net/i2p/data/i2cp/SendMessageMessage.java
@@ -41,7 +41,7 @@ public class SendMessageMessage extends I2CPMessageImpl {
     /**
      * Return the SessionId for this message.
      *
-     * @since 0.9.19
+     * @since 0.9.21
      */
     @Override
     public SessionId sessionId() {
diff --git a/core/java/src/net/i2p/data/i2cp/SessionStatusMessage.java b/core/java/src/net/i2p/data/i2cp/SessionStatusMessage.java
index 122cf5d1e54edecd59b16942b1e680a035797fad..49509a552365482df6ca565cdc408b283b104bd5 100644
--- a/core/java/src/net/i2p/data/i2cp/SessionStatusMessage.java
+++ b/core/java/src/net/i2p/data/i2cp/SessionStatusMessage.java
@@ -45,7 +45,7 @@ public class SessionStatusMessage extends I2CPMessageImpl {
     /**
      * Return the SessionId for this message.
      *
-     * @since 0.9.19
+     * @since 0.9.21
      */
     @Override
     public SessionId sessionId() {
diff --git a/router/java/src/net/i2p/router/TunnelPoolSettings.java b/router/java/src/net/i2p/router/TunnelPoolSettings.java
index 315aeefb87221756b61397ee00a4abc152a8199d..b7984c085b69505d9b5363181dc5de0a2965f0bb 100644
--- a/router/java/src/net/i2p/router/TunnelPoolSettings.java
+++ b/router/java/src/net/i2p/router/TunnelPoolSettings.java
@@ -218,7 +218,7 @@ public class TunnelPoolSettings {
     /**
      *  Other destinations that use the same tunnel (or null if exploratory)
      *  Modifiable, concurrent, not a copy
-     *  @since 0.9.19
+     *  @since 0.9.21
      */
     public Set<Hash> getAliases() {
         return _aliases;
@@ -227,7 +227,7 @@ public class TunnelPoolSettings {
     /**
      *  Other destination that this is an alias of (or null).
      *  If non-null, don't build tunnels.
-     *  @since 0.9.19
+     *  @since 0.9.21
      */
     public Hash getAliasOf() {
         return _aliasOf;
@@ -237,7 +237,7 @@ public class TunnelPoolSettings {
     /**
      *  Set other destination that this is an alias of (or null).
      *  If non-null, don't build tunnels.
-     *  @since 0.9.19
+     *  @since 0.9.21
      */
     public void setAliasOf(Hash h) {
         _aliasOf = h;
diff --git a/router/java/src/net/i2p/router/tunnel/pool/AliasedTunnelPool.java b/router/java/src/net/i2p/router/tunnel/pool/AliasedTunnelPool.java
index 03b8f05636d8999d83c3833216211175d3a22eb6..1dc45eb613c32bb5035b90f39c7406b7841f43b6 100644
--- a/router/java/src/net/i2p/router/tunnel/pool/AliasedTunnelPool.java
+++ b/router/java/src/net/i2p/router/tunnel/pool/AliasedTunnelPool.java
@@ -15,7 +15,7 @@ import net.i2p.util.Log;
  *  A tunnel pool with its own settings and Destination,
  *  but uses another pool for its tunnels.
  *
- *  @since 0.9.20
+ *  @since 0.9.21
  */
 public class AliasedTunnelPool extends TunnelPool {
     
diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java
index f318b479de28b7e3fd68960ec9f1d991288a93a5..e2e54e6e1af9cb2f9129d21fef8c08b7e6339398 100644
--- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java
+++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java
@@ -441,7 +441,7 @@ public class TunnelPoolManager implements TunnelManagerFacade {
      *  Must have same encryption key an a different signing key.
      *  @throws IllegalArgumentException if not
      *  @return success
-     *  @since 0.9.19
+     *  @since 0.9.21
      */
     public boolean addAlias(Destination dest, ClientTunnelSettings settings, Destination existingClient) {
         if (dest.getSigningPublicKey().equals(existingClient.getSigningPublicKey()))
@@ -485,7 +485,7 @@ public class TunnelPoolManager implements TunnelManagerFacade {
 
     /**
      *  Remove a destination for the same tunnels as another.
-     *  @since 0.9.19
+     *  @since 0.9.21
      */
     public void removeAlias(Destination dest) {
         Hash h = dest.calculateHash();