Merge branch 'fix-15' and 'fix-631' into CombinedPRs