Issue #2265911 by D34dMan: PM Expense fixing merge conflicts issue introduced in previous commit.