Merge branch 'release/3.0'
fixed error handling with rejected invoice and payment plan
Merge branch 'hotfix/3.0.1' into develop