applied failed hunks manually
Merge branch 'apply_patch' into compile

remerged because of forgotten item from the reject list of patch tbtr_v0.4c.patch