rhine: merge of Sony 4.4.2 release