merged customisations from master branch