Feature/now 564

Those commits have already been merged into develop as part of NOW-577