Merge "Add crumpet to sysprop mapper" into main