MT's comments
WTC's comments
Move configuration flag
WTC review comments (more)
Fall back on malformed extension