WIP: Applying fixes for OS RSS(3.12): hook declarations and fix function name.

#5678