davep/shining-fixes-merge archive