Trunk 3814

Added a few changes and removed description validation