Merge "Update comment about enabled extensions"