Update few bugs
Merge branch 'fixed-inscl' into develop