DATACMNS-409 - Preparing next development iteration.