Prepared for new development iteration towards 1.2.0