REP-0127: updates from internal review comments