Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Adding some checks to prevent attachments requiring more hard points than available to be added to select list.
Merge branch 'master' into develop