Better embedded support and user experience for native
http://svn.apache.org/r1834595 http://svn.apache.org/r1834660