Stability improvements
Merge branch 'production' of github:Alghayma/Alghayma