Merge branch 'JAL-972-dasobert-to-jdas' into JAL-972-jdas