Fixing annotations (cherry picked from commit 1c109e4) (cherry picked from commit 55b37fa)
Adding test for bug #5656
Fixing bug #5656