fix Eclipse package problem
Merge commit '49639ed344650950ecaa7e4dced3e88e71f10f6c' into vani's_branch