Code

Applied patch 1500659 for warning cleanup