Bug fix
Merge branch 'devel_ek' into optimize_inlinks