Fixed string comparison using equals
Merge branch 'table-annotation' into development