STORM-80 : Merge from fixes done in production