Fix programtaic appendages
Merge branch 'master' into develop