Mil 196

Please see comments on Jira for more details