Fix for update call
Add kwps_question
Merge remote-tracking branch 'origin/develop' into develop