Added asset enrolling.
Merged conflicts