- print friendly: some enhancements, fixes
Merge origin/Development into Development