Merged manually pull request by SantSkeeta