some prep work for 1.4.5 merge
merged in 1.4.5-SNAPSHOT