Marking as a duplicate of AEROGEAR-9009 since it's being done in the PR for that one.