Merge "Maintenance: add fatalError() method"