SVEA-31: Merge with master
SVEA-31: Showing initial fee for payment plan