DB - Fixed image loading problem
Merge commit '171a40c50ace8f1b2b2cf3d501187b5ba308d277'