Merge of jlee-r7-feature/verify-password