Rebased enc sync

Missing doc doc :)