diff --git a/CHANGES.html b/CHANGES.html
index a36686b30..c03abefbc 100644
--- a/CHANGES.html
+++ b/CHANGES.html
@@ -65,6 +65,19 @@ us a note on ns-developers mailing list.</p>
       <li>A new information element has been added:  HeCapabilities. This information element is added to the MAC frame header if the node is a HE node. This HeCapabilites information element is used to advertise the HE capabilites of the node to other nodes in the network.</li>
     </ul>
 </li>
+<li>Included carrier aggregation feature in LTE module</li>
+    <ul>
+      <li>LTE model is extended to support carrier aggregation feature according to 3GPP Release 10, for up to 5 component 
+      carriers. </li>
+      <li>InstallSingleEnbDevice and InstalSingeUeDevice functions of LteHelper are now constructing LteEnbDevice and LteUeDevice 
+      according to CA architecture. Each device, UE and eNodeB contains an instance of component carrier manager, and may 
+      have several component carrier instances.</li>
+      <li>SAP interfaces are extended to include CA message exchange funtionality.</li>
+      <li>RRC connection procedure is extended to allow RRC connection reconfiguration for the configuration of the secondary carriers.</li>
+      <li>RRC measurement reporting is extended to allow measurement reporting from the secondary carriers.</li>
+      <li>LTE traces are extended to include component carrier id.</li>
+    </ul>
+</li>
 <li>Function <b>PrintRoutingTable</b> has been extended to add an optional Time::Units
     parameter to specify the time units used on the report.  The new parameter is
     optional and if not specified defaults to the previous behavior (Time::S).
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 96d06a8b2..b1ab0c392 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -23,6 +23,7 @@ New user-visible features
 -------------------------
 - (wifi) 802.11ax High Efficiency (HE) physical layer modes are now supported.
 - (tcp) The SACK option and the RFC 6675 loss recovery algorithm are now supported.
+- (lte) LTE carrier aggregation feature according to 3GPP Release 10 is now supported.
 
 Bugs fixed
 ----------
diff --git a/doc/models/Makefile b/doc/models/Makefile
index d97bb7933..51315f7e3 100644
--- a/doc/models/Makefile
+++ b/doc/models/Makefile
@@ -121,6 +121,9 @@ SOURCEFIGS = \
 	$(SRC)/wifi/doc/source/figures/snir.dia \
 	$(SRC)/wifi/doc/source/figures/clear-channel.eps \
 	$(SRC)/wifi/doc/source/figures/nist-frame-success-rate.eps \
+	$(SRC)/wifi/doc/source/figures/nist-frame-success-rate-n.eps \
+	$(SRC)/wifi/doc/source/figures/nist-frame-success-rate-ac.eps \
+	$(SRC)/wifi/doc/source/figures/nist-frame-success-rate-ax.eps \
 	$(SRC)/wimax/doc/WimaxArchitecture.dia \
 	$(SRC)/lte/doc/source/figures/epc-ctrl-arch.dia \
 	$(SRC)/lte/doc/source/figures/epc-data-flow-dl.dia \
@@ -370,7 +373,10 @@ IMAGES_EPS = \
 	$(FIGURES)/802-15-4-per-sens.eps \
 	$(FIGURES)/802-15-4-psr-distance.eps \
 	$(FIGURES)/clear-channel.eps \
-	$(FIGURES)/nist-frame-success-rate.eps
+	$(FIGURES)/nist-frame-success-rate.eps \
+	$(FIGURES)/nist-frame-success-rate-n.eps \
+	$(FIGURES)/nist-frame-success-rate-ac.eps \
+	$(FIGURES)/nist-frame-success-rate-ax.eps \
 
 # rescale pdf figures as necessary
 $(FIGURES)/testbed.pdf_width = 5in
@@ -425,6 +431,9 @@ $(FIGURES)/lr-wpan-primitives.pdf_width = 3in
 $(FIGURES)/lr-wpan-arch.pdf_width = 2in
 $(FIGURES)/clear-channel.pdf_width = 12cm
 $(FIGURES)/nist-frame-success-rate.pdf_width = 12cm
+$(FIGURES)/nist-frame-success-rate-n.pdf_width = 12cm
+$(FIGURES)/nist-frame-success-rate-ac.pdf_width = 12cm
+$(FIGURES)/nist-frame-success-rate-ax.pdf_width = 12cm
 
 IMAGES_PNG = ${IMAGES_EPS:.eps=.png}
 IMAGES_PDF = ${IMAGES_EPS:.eps=.pdf}
diff --git a/src/lte/doc/source/conf.py b/src/lte/doc/source/conf.py
index 227126cea..35642ff52 100644
--- a/src/lte/doc/source/conf.py
+++ b/src/lte/doc/source/conf.py
@@ -48,9 +48,9 @@ copyright = u'CTTC'
 # built documents.
 #
 # The short X.Y version.
-version = 'v8'
+version = 'v10'
 # The full version, including alpha/beta/rc tags.
-release = 'v8'
+release = 'v10'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/src/wifi/doc/source/wifi-design.rst b/src/wifi/doc/source/wifi-design.rst
index 369889675..88cbcccd7 100644
--- a/src/wifi/doc/source/wifi-design.rst
+++ b/src/wifi/doc/source/wifi-design.rst
@@ -206,10 +206,8 @@ The SpectrumWifiPhy framework uses the ``Spectrum`` channel
 framework, which is not documented herein but in the Spectrum module
 documentation.
 
-YansWifiChannel
-###############
-
-This is the only channel model presently in the |ns3| wifi module.  The 
+The YansWifiChannel is the only concrete channel model class in 
+the |ns3| wifi module.  The 
 ``ns3::YansWifiChannel`` implementation uses the propagation loss and 
 delay models provided within the |ns3| :ref:`Propagation` module.
 In particular, a number of propagation models can be added (chained together,
diff --git a/src/wifi/model/wifi-net-device.h b/src/wifi/model/wifi-net-device.h
index 2ddf465ac..6e2751a32 100644
--- a/src/wifi/model/wifi-net-device.h
+++ b/src/wifi/model/wifi-net-device.h
@@ -136,9 +136,9 @@ private:
    */
   void LinkDown (void);
   /**
-   * Return the WifiChannel this device is connected to.
+   * Return the Channel this device is connected to.
    *
-   * \return WifiChannel
+   * \return Ptr to Channel object
    */
   Ptr<Channel> DoGetChannel (void) const;
   /**