resources: synchronization with beta branch