Make an effort to adhere the spec 7.6.3.2
Merge pull request #2657 from vyv03354/master

Make an effort to adhere the spec 7.6.3.2