Avoid exception
Merge branch '2-2-nemo-stable'