shrine

Pull request #1461: Feature/SHRINE2020 1505

Merge in SHRINE/shrine from feature/SHRINE2020-1505 to develop

* commit 'cb2b888eccc103bd859ad190a2ddc7d70cd2404e':
  Adapter fields for SHRINE2020-1505
  Added the easy QEP-related columns for SHRINE2020-1505
  Getting the peices in place for SHRINE2020-1505