CC-5244 : Exception when creating Smartblock
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x