Porting octane (richards - NON-FUNCTIONAL COMMIT)