Merge branch 'daniel_branch' into FrontEnd
[Modified/Created  #79327036] merging into overall frontend branch