Bugfix 165,166,164

Branch bugfix-164 contains bugfix-166, and branch bugfix-166 contains bugfix-164; Branch bugfix-164 bases on 2016.w50

see issues #165 (closed), #166 (closed) and #164 (closed)