Update common

Please do not merge this yet!