CustomCMDs now work at runtime and lockable
Reset Author
Merge origin/master