METAMODEL-59: Added Balendra Singhs contribution (with minor
modifications).