Merge branch 'bayercustoms' into bayercustoms-housingstation