Final steps of 2.11.481 porting