Merge branch 'feature/add-background-image-to-mastoapi' into 'develop'