Last changes for universal branch