CDB-3542 working specs and code for normal users too
CDB-3542