ACT-1699 Feature Implementation

https://jira.codehaus.org/browse/ACT-1699