Merge "Fixed image source detection in Oxygen"