Bad timing between merge of 364caf0fdf and c0f6f52669 a few minutes apart caused issues. Fixing it here !
364caf0fdf
c0f6f52669