Merge reduction of skeleton usage from develop