merged changes related to bug 1114, 2209, 1961 and 1792 into the svn repository