Fix for timing issue when reviewing submission.
Merge branch 'Branch_0c384f041f12264dd83c2618ebbfb3ad8c3cf6ab'