Fixes and changes for v 14.03
Merge branch '14.03'