CON-1789 restore previous order of body modules initiation