Apply core patches
Merge branch 'firsttry' into tickets