Merge "Update Spelling issue Issue-ID: AAF-453"