[bknr-devel] Merging development branch