Clean code
Fix: table name differs.
Merge remote-tracking branch 'Upstream/develop' into develop-patch1