Add view modificators f-me/carma#1235 f-me/carma#1236
Merge remote-tracking branch 'refs/remotes/fme/master'