Respond to deprecation warning following merge from master