Merge branch 'requirement-specs-custom-variables'