Additional methods to simplify extension of control capabilities
Merge origin/master