Merge branch 'hotfix/1.0.2'
check first to see if 3rd filetr param is set
Merge branch 'hotfix/1.0.3' into develop