BF-1747 - Update for angles with the upstream repository

Jira https://ifeelgoods.atlassian.net/browse/BF-1747