Commit merge from RBDOOM-3-BFG