Merge commit 'isl-0.05.1'