develop - GitHub - cc1d245bf38d4ca0afc9124a9fa38ea96f014b85 - Merge pull request #1253 from SweetEscapeDev/fix/sonar