* Format missed files * Remove unnecessary rule * Fix type error
Also added integration test in production for this Fixes: #6285