Merge "Updated from comments to previous change after submitting"