Feature opal 2140

Preliminary commit for review.