Merge "Fix namespace for picture"