1.2/dev-BUG42 Fix unapplied changes