Merge from sadik  and gallery fixes