fix(ci) merge NOW-186 on to develop branch