Merge commit '2079f11057532a4f291af2b63ff955e81c20a952' into entidi
Merge branch 'entidi' into dev