upd: initial checkin, merge from vrok-lib & application