Merge pull request #2597 from castillofrancodamian/oslr