- Initial commit for issue #302