[RF-220][MOD] advance payment changes

Merged Matias requested to merge RF-220 into 12.0-stage

Closes RF-220

Merge request reports