Hai's bitbucket version of 2019-08-16 merged with Annick's and my own clean-up/consolidation efforts