master sync from actorquedeveloper