Fix for issue 1796.
Merge branch 'development' of https://github.com/cbsrbiobank/biobank into development