The latest changes taken from develop for fixing merge issues : STORM-80