fixed merge master from gallery branches