Implementing https://issues.apache.org/jira/browse/STRATOS-892