Merge branch 'hotfix/1.3.1' into develop
Makefile change only
Change inc guards to avoid potential impl conflict
Merge branch 'release/1.3.2'