http://jira.appbase.com/browse/APPBASEPM-2966
Major fixes