ohr/nf

Non-functional annotations