Merge pull request #5409 from gkhanna79/FixDetails