Merging development branch v0.9.9 stable

Fixed broken upload component