Merged examination changes from develop. Refs 5aa9167332090e91a31f38023d2cad65de5d5c8a