Adding final pin configurations
Merge branch 'develop'