merge development branch

Unused parameter `options`