HBAD-617

Recently added