Georgi Sinekliev's commit
Georgi Sinekliev's commit (reverse-merged from commit f8c8e4a5660781259fe1ffda086a122ef2a1f70d)
Updated entities from Azure database