Merge pull request #2147 from VinRudramurthy/dev-branch

My collections: dev-branch - Added resource reorder missing code from 6.6.3.a1 branch.
My classes: Displayed assignment highlight issue rectified.