Merge branch 'feat/majak-images' into 'master'