Fix features; OSRA-243 #Code-Review