Fixed invoice inconsistencies with various conf flags RT#78190