Changes var name version_id to entry_id
Merge remote-tracking branch 'origin/develop' into develop