Merge branch 'amh-genericize' into 'master'

genericize things

See merge request !3
1 job for master in 3 minutes and 39 seconds (queued for 1 second)
Status Job ID Name Coverage
  Release
passed publish #9011

00:03:39