Hotfix issues introduced by 2b94404eec571cafcc3c856caffaa4b29c5b52eb a=@gozala