merged fixed form development branch