Resolves SWAMID-3512