See https://jira.dev.bbc.co.uk/browse/MOBIP-15199 and https://jira.dev.bbc.co.uk/browse/MOBIP-15222 - View it on GitHub