Merged latest master and minor updates