Last changes to [FORMAT FIX] Quickfix wrong indenting from Ronald commits