Resolved merged #445 conflicts