Merge master into img-playground. Image support with new management features. Missing...