implementation of user's and vendor's wishes
Merge remote-tracking branch 'upstream/master'