Feature 1237 commit