Load className from layout

Enable the loading of the className from layout nodes
Merge remote-tracking branch 'origin/master' into services