--- src2/gnuradio/gnuradio-runtime/lib/buffer.cc	2016-04-11 16:40:08.761404376 -0700
+++ src/gnuradio/gnuradio-runtime/lib/buffer.cc	2016-04-11 16:45:51.577389682 -0700
@@ -142,6 +142,12 @@
     }
 
     d_base = (char*)d_vmcircbuf->pointer_to_first_copy();
+
+    // aero-patch: KC29932
+    // Use only requested amount of items of the allocated space; 
+    // May be less than a page size
+    d_bufsize = orig_nitems;
+
     return true;
   }
 
--- src2/gnuradio/gnuradio-runtime/include/gnuradio/buffer.h	2016-04-11 16:47:02.105386658 -0700
+++ src/gnuradio/gnuradio-runtime/include/gnuradio/buffer.h	2016-04-11 16:48:15.117383529 -0700
@@ -67,6 +67,11 @@
      */
     int bufsize() const { return d_bufsize; }
 
+    /*! aero-patch: KC29932
+     * \brief actual page-aligned size of buffer in items (allocated amount)
+     */
+    int bufsizealigned() const { return d_bufsize_page_aligned; }
+
     /*!
      * \brief return the base address of the buffer
      */
@@ -149,6 +154,9 @@
     char			       *d_base;		// base address of buffer
     unsigned int			d_bufsize;	// in items
 
+    // aero-patch: KC29932
+    unsigned int      d_bufsize_page_aligned; // in items, actual page-aligned buffer space
+
     // Keep track of maximum sample delay of any reader; Only prune tags past this.
     unsigned d_max_reader_delay;
 
--- src2/gnuradio/gnuradio-runtime/include/gnuradio/block_gateway.h	2016-04-11 16:58:38.121356825 -0700
+++ src/gnuradio/gnuradio-runtime/include/gnuradio/block_gateway.h	2016-04-11 16:53:18.621370520 -0700
@@ -278,6 +278,19 @@
       d_msg_handlers_feval[which_port] = msg_handler;
     }
 
+    // aero-patch: EG26648
+    long block__max_output_buffer(size_t i) {
+        return gr::block::max_output_buffer(i);
+    }
+
+    void block__set_max_output_buffer(long max_output_buffer) {
+        gr::block::set_max_output_buffer(max_output_buffer);
+    }
+
+    void block__set_max_output_buffer(int port, long max_output_buffer) {
+        gr::block::set_max_output_buffer(port, max_output_buffer);
+    }
+
   protected:
     typedef std::map<pmt::pmt_t, feval_p *, pmt::comparator> msg_handlers_feval_t;
     msg_handlers_feval_t d_msg_handlers_feval;