WEBSPARK-337, WEBSPARK-254 into master