Merge "Adding Uniform stack trace" into devel/master