Merge "Label the close image button" into oc-dev