Merge "Add new modules: Resource Lock and Doorman"