Modified in 'trivial-11-branch'
