Merge branch 'release/6.1'
Refactoring
Merge commit '7294e10408abbbc992c9c7dab38fe1af290970af'

* commit '7294e10408abbbc992c9c7dab38fe1af290970af':
  Refactoring
Refactoring
Minor UI tweaks