#99 Preparing next development iteration M3