SGF-347 - Prepare next development iteration.