Merge "Dump startup and post startup methods for --dump-only"