Merge branch 'entity-tag-refactor' into 'master'

Refactor using Entity tags

See merge request !52
9 jobs for master in 6 minutes and 30 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed clang-c++11 #68926
Linux

00:01:50

passed cppcheck #68928
Linux

00:00:20

passed doc #68933
Linux

00:00:16

passed gcc-c++11 #68925
Linux

00:03:54

passed macos-c++11 #68927
Apple

00:02:53

passed VS2015-32-bit #68932
VS2015

00:01:15

passed VS2015-64-bit #68931
VS2015

00:01:21

passed VS2017-32-bit #68930
VS2017

00:01:11

passed VS2017-64-bit #68929
VS2015

00:01:19