Settled with Git
Merge remote-tracking branch 'origin/master' into dev-entitties