Patches for no perf-data check_swap [sf#1614554] [#724]