Merged local develop with Finalizing BCrypt